more fixes and lint