Removed old and unused code
Fixed override when set to 100%
close #107