fixed wrongdoings and updated with .props