refactored names, small fixes