Some Fixes, more needed