final commit

sorry for the mess