Work on issues

#9, #10, #11, #23, #26, #28, #30