fixing some minor bugs & stuff