Work on issues

#12, #21, #24, #27, #29, #31, #32, #33, #35, #36