fixes for issues 1 & 2