fixes: #14 #16 #17