added a few fixes and todos
added a few fixes and todos