Crazy Main fixes