Various fixes and new preview feature