Cleaned up & added some actions