yet another commit with improvements and bug fixes