more bug fixes
need to update end still