fixing a lot of systems stuff