Added more notes and changed some names
Try to have an indent line for everything below h*