Fixed some formatting.  Converted doubles to singles.
merge