Feature/fixes

Some fixes I had to make to get this to work with my setup.