placeholder fixes, building texts added
minor fixes and refactoring