fixed some simple todos