fixed and trimmed
add hash bookmark
cleaned up