tweaks and fixes, less plugins