fixed everything that monster refactor broke.....

....afaik