make some more cleanups or whatever.. beginn to work around the structure, not features..