final functional tweaks, future commits will be optional beautifying commits