Fringe validation cases and cleanup

Still need castling