Fixed and cleaned some stuff