Fixes

Should bring you up to a fully working state