Added softtabstop option and several others. Restructuring