compile fixes -.-

tweaks also