Improved construction, some minor fixes