added/fixed stuff