Fix batch of reported issues (#18, #19, #23, #25, #26, #27, #28)

Fix batch of reported issues (#18, #19, #23, #25, #26, #27, #28) #10