Fixed indent
Various fixes