Fix some shit
Fix some stuff