Ported the instance type and fixed a few things.