Improvements

More details on seamark:*:category and a few other improvements