more cleaning + finished first version of subject