Fixed some possible bugs with flag strings
Removed old Stuff
Merge branch 'beta'