Bug fixes and clean up
New script