fixed various issues from Will/Edd