Surfbar continued and some rewrites/fixes: