some cleanup and added html