adding several tools and re-formatting code