Save Finally works and some touch ups all around