vast improvements.

this is waay better