Updated verson number; cleaned up TODO messages