updated, fixed stuff