bugfixes
whoops, pass this guy back up the stack please.