fixing some things mrrr