... fixed acouple bugs