few enhancements, all mode etc