Beta 2, various features and improvements