fixed todo in minor bugs