#16 Fixed remaining incremental feedback issues
#16 Added handling of special cases