second commit: fixed stuff