code cleanup before merging branch
fixed content looking ugly in berg's prototyper