a few bug fixes, more styling in progress