Version 1.0 - Bug fixes and cleanup