minor changes
several changes, forgetting at them at the moment