correcting lot of bug (lulz)