Fixed label and some other minor improvements/fixes.