more tweaks + swift support
fix conflicts