small changes to many things [fixess #130]