* Debug stuff + added a couple fixes hopefully