fixed links, realigned objects
more cleanup