fixes and more prelude