Some Fixes and Small Changes