Fixed some save errors, as well as Issues #5, #12 and #14