Make improvements and bug fixes