made some fixes and name changes