Some bug fixes, new features changed.