Major improvements around bookmark