fixed shit
fixed moar shit