various changes to move from archlinux to ubuntu