Update

More fixes, closer to working now