various fixes;