Working on all function and cleaning up other spots.