Finalizing fixes

Everything works now.