Adds #3; Smaller fixes and additions