a bit of additional awesomeness and a few bug fixes