Final Changes

Pre Beta Release