hopefully fixed some dealbreakers now