v. 2. 5

bug fixes and general cleanup