remove comments, some changes to action handling