Some tweaks and RWD updates

Messy, messy. T___T