some tidy up. some glimmer of comprehension...