added a few fixes.... only adding a few at a time so I can hopefully get a booting build