more progress

features and stuff