alpha

-major things fixed