major update

bug fixes, added new features