some formatting and finalizing (ish)