fome fixes and test