more fixes and a test/preview