Fixed bugs, added new support, cleaned up code
Fixed bugs, added new support, cleaned up code
minor change