Fixed some minor issues, implemented Handlers