some more scratchings, rudimentary structuring, added more 'features' (bugs)