somewhat fixed bpt
added 2 todo's