Various small changes to comply to guidelines for publishing