Crazy intense bug fixes

# Made you look