Still fixing some minor bugs