bug fixing and new features