added the remaining functions and cleaned up the naming