Added support for different kind of surfaces and various other minor changes