Commented out some stuff to port, minor fixes.