Issues 12 & 28 have been fixed.