fall cleanup, some nice changes... up next remove that crapular :P