last commit

with some fixed stuff