Final touch ups for now