Added selectOption override, tabfixes and misc. refactoring