fixing lint errors and other fixes