fixed some issuess that occurred after merging branches, should be fine now