final commit with code cleanup; project is finished mostly