removed virtual when not needed
other small changes