Fixed indentitaion errors. All the new code works - merging to master.