Updates to fix mistakes and work stuff out