made things not horribly broken \o/