done some todos, cleaned up code & examples