Fixed and reverted some stuff