some minor changes
resolved conflicts
working on liking shit
Merge branch 'dev' into likeable