Cleanup/alpha fixes

alpha 8 level code