added actions & several bug fixes