2AM BUGFIX

BUGFIXINGS