Missing classes and small fixes

Code is running.