adding a few more functions and clearing up the naming variables