xs draft + some fixes
fixes