Issues #50, #49, #53, #54, #58, #59, #53