Additional expertience and minor fixes