=fixing some minor bugs