Various bug fixes and improvments
Various bug fixes and improvments