Fixed some actions, more coding standards