What do i change/add to make this setup better?