Some bug and display fixes