big fixes, added preview