Hopefully fixed more bugs for the live demo