finishing touches
fixed merge conflicts i hope