Fixed some problems found in testing. Now appears to be working fully.