Misc updates. Now compiling.