More fixes
Final fixes and removing demo posts