Should fix some pod management issues

Still need to get rid of that stupid target