Tested and bug fixes in.