styling and some fixes/improvements