Bug fixes and added noted for inline code