Updated some stuff
updated posts
Merged stuff