Some refinements

by Marcus Olovsson