Minor updates and change hacker to maker