fixed some wrongdoings