Issues #14, #15, #13, and partly #7 are fixed