adding disable functionality and cleaning up warnings