Some more updates by Warpten as well as tabs to spaces.