fixed bugs, added bugs, finished alpha