tab spacing and code updates
stable v0.5.0 version