cleaned up warnings and TODOs