add a couple FIXMEs for things i overlooked