Fixed some minor bugs and added actions and filters