Code cleanup and changed the way settings are send to target handlers (now way easier to setup and cleaner)
Added error handling to some methods in Core