fixes and new cancel loading implementation