Fixed A ton of various bugs and inconsistencies