made some tweaks with kpossin and a TODO list