Fixed errors on Dispatcher class and fixed general issues and formats.