3 am bug fix marathon

with like 3 bugs fixed, some marathon.