Uploading version .5 beta
Fixing bugs