few fixes

fixing a few things that dont need to be here on this fork.