improved automatic actions (more elegant solution) + minor changes