Converted indendation to spaces, misc smaller fixes