fix(general) general improvements