Minor Changes and fixes, still not fully working