Did some minor changes and added actions.