some morefixes