Some Fixes.
Some more changes