Bug fixes, added create user script, cleanup.