Fixed several Bugs. ALPHA1 Hit