update

bug fixes, not done yet