little tweaks and filtering (in progress)