big fixes, revolves #4 - also resolves #3