some extra improvements/fixes