Some fixes and added missing files. Oops!