cleaned up pins scaffold and some other things