a little cleanup and added FS inbound