Updates and bug fixes from testing