fixing stuff
merge with master