updating config
adding bug fixes