some tweaks and aesthetics