render improvements and bug fix