Apply fixes from feedback 1, close #17