cleaning things up + added autocomplete for make