bug fixes after fixing the bugs...