Added InfoBox usage, some bug fixes, minor refactoring.