close #2, close #3 and some profile fixes