package fix
general improvements