tweaks and fixes mang