Updates and bug fixes after weekend testing