Added todo list + minor fixes in beans