some updates as suggested by @eridius