fixed #15 and a fixing up other inaccuracies