Removed Demo, Fixed Beta4 errors