fixing #13 (again) + lint warnings