Update files with fixes from real testing
Imported files from real development