fixing bugs!!