mostly replaced HTML objects with links
preparing for release 0.1