Update version number (don't release yet) and update todo's