Fix bugs and other features