Small Fixes and Trim Trailing Space