some small approvements :)