some styling fixes, bug fixes