removed place holders and fixed a few errors