some minor updates and tweaks, before compass got all sassy