fixed slight problems