Sam's Little Merge v2

This lil merge always finds ways to surprise me! It is a mostly stylized checkpoint, but prompt adherence can be surprisingly good for a 1.5 model!