several updates to fix minor bugs