More work towards dc surfing, gun tweaking, more refactoring