Various improvements and bug fixes
Important bug fix
Important bug fix