Cleaned up, moved service restart to end, changed file resources a bit