F/S couple of bits

completed