Improvements to commands for bookmarks and lua