bugs & minor changes