diff --git a/data/base_16.md b/data/base_16.md
index b283c4c..5580b2f 100644
--- a/data/base_16.md
+++ b/data/base_16.md
@@ -1,6 +1,6 @@
 ---
 title: "Base 16"
-tags: [ "Data" ]
+tags: [ "data" ]
 ---
 
 ```bash
diff --git a/data/calcurse.md b/data/calcurse.md
index afebbfc..9b6c0f6 100644
--- a/data/calcurse.md
+++ b/data/calcurse.md
@@ -5,5 +5,10 @@ tags: [ "data", "calendar", "daylight savings" ]
 
 ## Setup
 
-The UK government keeps an ics file with clock, [here](https://www.gov.uk/when-do-the-clocks-change/united-kingdom.ics).
+The UK government keeps an `ics` file with clock.
+
+```sh
+wget https://www.gov.uk/when-do-the-clocks-change/united-kingdom.ics
+calcurse -i united-kingdom.ics
+```
 
diff --git a/data/email.md b/data/email.md
index fbcbc57..3124dc9 100644
--- a/data/email.md
+++ b/data/email.md
@@ -9,10 +9,10 @@ Install `opensmtpd` (or similar), then `ncat` or `nc` or `netcat` (this mysterio
 
 Start the `opensmtpd` service, then use netcat to speak with the mail-daemon:
 
-
-```
+```sh
 nc localhost 25
 ```
+
 The computer should respond with code `220`, which means 'I am listening'.
 
 > 220 hex ESMTP OpenSMTPD
@@ -40,7 +40,7 @@ Tell the mail daemon who you are in this format.
 
 Then tell it who you're sending to.
 
-```
+```sh
 RCPT TO: <www@dmz.rs>
 ```
 
@@ -67,7 +67,7 @@ You will find the email under `/var/spool` or `/var/mail` or similar.
 
 If unsure, just take a part of your email, like `FRAGMENT="turn off server please"`, then `grep` for it:
 
- ```bash
+ ```sh
 sudo grep -r $FRAGMENT /var/spool/*
  ```
 
diff --git a/data/exiftool.md b/data/exiftool.md
index 6040c4e..2f27df8 100644
--- a/data/exiftool.md
+++ b/data/exiftool.md
@@ -1,17 +1,17 @@
 ---
 title: "exiftool"
-tags: [ "Metadata" ]
+tags: [ "metadata", "exifdata" ]
 ---
 
-Find metadata.
+Find metadata:
 
-```bash
-exiftool image.jpg
+```sh
+exiftool "$file".jpg
 ```
 
-Find info on all images in current directory.
+Find info on all `.png` images in current directory.
 
-```bash
+```sh
 exiftool -ext .png .
 ```
 
@@ -19,22 +19,14 @@ You can make this recurring with the -r switch.
 
 And overwrite all metadata:
 
-```bash
+```sh
 exiftool -all= -overwrite_original -ext jpg .
 ```
 (NB: This does not work on pdf data. See [here](pdf_erasure.md) for erasing all pdf data)
 
 Or just GPS data:
 
-```bash
+```sh
 exiftool -gps:all= *.jpg
 ```
 
-You can also use the imagemagick tool:
-
-```bash
-identify -verbose
-```
-
-
-
diff --git a/data/gpg.md b/data/gpg.md
index 3f0bd28..2e489b6 100644
--- a/data/gpg.md
+++ b/data/gpg.md
@@ -1,6 +1,6 @@
 ---
 title: "gpg"
-tags: [ "data", "GPG" ]
+tags: [ "data", "gpg" ]
 ---
 
 - [Setup](gpg/basics.md)
diff --git a/data/groff.md b/data/groff.md
index 452ffc3..3601617 100644
--- a/data/groff.md
+++ b/data/groff.md
@@ -1,6 +1,6 @@
 ---
 title: "groff"
-tags: [ "Data" ]
+tags: [ "data", "logic" ]
 ---
 # Basic Documents
 
diff --git a/data/khard.md b/data/khard.md
index 9c9fa59..d113fa5 100644
--- a/data/khard.md
+++ b/data/khard.md
@@ -4,57 +4,49 @@ tags: [ "Data" ]
 ---
 Get the basic config:
 
-```bash
+```sh
 mkdir ~/.config/khard
 ```
 
-```bash
+```sh
 cp /usr/share/doc/khard/examples/khard/khard.conf.example ~/.config/khard.conf
 ```
 
 Short list
 
-```bash
+```sh
 khard list
 ```
 
 Longer list
 
-```bash
+```sh
 khard show
 ```
 
 Show from addressbook 'work'
 
-```bash
+```sh
 khard list -a work
 ```
 
 Make a new contact in address book 'family'
 
-```bash
+```sh
 khard new -a family
 ```
 
-```bash
+```sh
 khard edit grampa
 ```
 
-```bash
+```sh
 khard remove bob
 ```
 
 Move contact 'nina' from 'work' to 'home' address book.
 
-```bash
+```sh
 khard move -a home nina -A work
 ```
 
-## Advanced
-
-Merge:
-
-```bash
-khard merge [-a source_abook] [-u uid|search terms [search terms ...]] [-A target_abook] [-U target_uid|-t target_search_terms]
-```
-
diff --git a/data/pass.md b/data/pass.md
index c10a847..8aca8da 100644
--- a/data/pass.md
+++ b/data/pass.md
@@ -1,42 +1,42 @@
 ---
 title: "pass"
 tags: [ "data" ]
+requires: "GPG Basics"
 ---
-[Video instructions](https://www.hooktube.com/watch?v=hlRQTj1D9LA)
 
 Setup [gpg](./gpg.md) keys.
 
 Show your gpg secret it:
 
-```bash
+```sh
 gpg --list-secret-keys
 ```
 
 Then use the id number under `sec` to make a pass repo:
 
-```bash
+```sh
 KEY="$(gpg --list-secret-keys  | grep -m 1 -A1 '^sec' | tail -n 1)"
 ```
 
-```bash
+```sh
 pass init $KEY
 ```
 
 To add a basic password, e.g. for `$WEBSITE`:
 
-```bash
+```sh
 pass $WEBSITE
 ```
 
 To insert a multiline password, e.g. with a login name:
 
-```bash
+```sh
 pass add -m $WEBSITE
 ```
 
 Remove a password:
 
-```bash
+```sh
 pass rm $WEBSITE
 ```
 
diff --git a/data/pdf-to-txt.md b/data/pdf-to-txt.md
index 2367cef..47cebf5 100644
--- a/data/pdf-to-txt.md
+++ b/data/pdf-to-txt.md
@@ -2,7 +2,8 @@
 title: "pdf to txt"
 tags: [ "data", "pdf", "ocr" ]
 ---
-How to translate pdf book images to text (results are very poor, and will need lots of corrections).
+
+How to translate pdfs to text (results are very poor, and will need lots of corrections).
 
 ## Dependencies
 
diff --git a/hardware/keyboard.md b/hardware/keyboard.md
index b4a6a88..f81c3d8 100644
--- a/hardware/keyboard.md
+++ b/hardware/keyboard.md
@@ -9,7 +9,7 @@ This works everywhere, including in a bare-ass tty.
 
 Select a keymap, and create a new custom map.
 
-```bash
+```sh
 su root
 
 basemap=/usr/share/kbd/keymaps/i386/qwerty/pl1.map.gz
@@ -22,7 +22,7 @@ gunzip -c $basemap | \
 
 Tell the system to use this keymap at startup by naming it in the `rc.conf` file:
 
-```bash
+```sh
 echo "KEYMAP=$newmap" >> /etc/rc.conf
 
 cat /etc/rc.conf
@@ -33,24 +33,24 @@ reboot
 
 Set layout to British English.
 
-```bash
+```sh
 setxkbmap -layout gb
 ```
 
 Or Polish with:
 
-```bash
+```sh
 setxkbmap -layout pl
 ```
 
 | Language | short |
-|:--------|:------|
-| Polish  | pl |
-| Serbian | rs |
+|:---------|:------|
+| Polish   | `pl`  |
+| Serbian  | `rs`  |
 
 Set 'alt + shift', as the command which cycles through the British English, Polish and Serbian keyboard layout.
 
-```bash
+```sh
 setxkbmap -layout gb,pl,rs -option grp:alt_shift_toggle
 ```
 
diff --git a/networking/wifi.md b/networking/wifi.md
index 86481c2..5cf28cd 100644
--- a/networking/wifi.md
+++ b/networking/wifi.md
@@ -1,7 +1,8 @@
 ---
-title: "wifi"
+title: "network"
 tags: [ "Networking" ]
 ---
+
 # Netstat Stuff
 
 Stats on local net usage within domain.
diff --git a/networking/wireguard.md b/networking/wireguard.md
index 68987c7..6cca495 100644
--- a/networking/wireguard.md
+++ b/networking/wireguard.md
@@ -1,6 +1,6 @@
 ---
 title: "wireguard"
-tags: [ "Networking", "VPN" ]
+tags: [ "networking", "VPN" ]
 ---
 <!--
 from 
@@ -11,25 +11,22 @@ https://engineerworkshop.com/blog/how-to-set-up-wireguard-on-a-raspberry-pi/
 
 Install `wireguard-tools` on the server.
 
-```bash
-sudo -i
-```
-
-```bash
+```sh
+su root
 cd /etc/wireguard
 ```
 
 umask 077
 
-```bash
+```sh
 wg genkey | tee server_private_key | wg pubkey > server_public_key
 ```
 
-```bash
+```sh
 wg genkey | tee client_private_key | wg pubkey > client_public_key
 ```
 
-```bash
+```sh
     echo "
     [Interface]
     Address = 10.0.0.1/24
@@ -98,6 +95,6 @@ Add multiple peers by copying the `[peer]` section (they each get called `peer`)
 
 Make a standard client configuration, then:
 
-```bash
+```sh
 qrencode -t ansiutf8 < /etc/wireguard/mobile_user.conf
 ```
diff --git a/networking/wireless.md b/networking/wireless.md
index f82915c..de50d23 100644
--- a/networking/wireless.md
+++ b/networking/wireless.md
@@ -1,60 +1,63 @@
 ---
 title: "wireless"
-tags: [ "Networking" ]
+tags: [ "networking" ]
 ---
 
-# Check wifi's working
-```bash
+Check wifi's working
+
+```sh
 lspci -k
 ```
 
 Or for usb wifi: 
 
-```bash
+```sh
 dmesg | grep usbcore
 ```
 
-... and hopefully it'll say the new interface is registered.
+...and hopefully it'll say the new interface is registered.
 
-# Check if a wifi interface has been created
+Check if a wifi interface has been created
 
-```bash
+```sh
 ip link
 ```
 
-or
+...or
 
-```bash
+```sh
 iw dev
 ```
 
 Assuming it's wlan0, bring it up with 
 
-```bash
+```sh
 ip link set wlan0 up
 ```
 
 Error messages probably means your wireless chipset requires a firmware to function.  In this case, check the kernel messages for firmware being loaded
 
-```bash
+```sh
 dmesg | grep firmware
 ```
 
 # Utilities
 
-iw doesn't do wpa/wpa2.  wpa_supplicant does everything.  iwd does everything except WEXT encryption.
+- `iw` doesn't do wpa/wpa2.
+- `iwd` does everything except WEXT encryption.
+- `wpa_supplicant` does everything.
 
 # Connecting
 
 Get the link status:
 
-```bash
+```sh
 iw dev wlan0 link
 ```
 
 Scan for available points:
 
-```bash
+```sh
 iw dev wlan0 scan
 ```
 
diff --git a/networking/wpa_supplicant.md b/networking/wpa_supplicant.md
index a761986..360c860 100644
--- a/networking/wpa_supplicant.md
+++ b/networking/wpa_supplicant.md
@@ -3,55 +3,55 @@ title: "wpa_supplicant"
 tags: [ "Networking" ]
 ---
 
-wpa_supplicant configurations are stored in /etc/wpa_supplicant/wpa_supplicant-wlan0 (or equivalent).
+`wpa_supplicant` configurations are stored in `/etc/wpa_supplicant/wpa_supplicant-wlan0` (or equivalent).
 
 ## WiFi Connection
 
-```bash
+```sh
 wpa_cli
 ```
 
 Once in, scan the network, add an empty place to store credentials, then input them.
 
-```bash
+```sh
 scan
 ```
 
-```bash
+```sh
 scan_results
 ```
 
-```bash
+```sh
 add_network
 ```
 
 This outputs a network number, e.g. '3'.  This is the new network you'll work with.
 
-```bash
+```sh
 set_network *3* ssid *"Kosachok Cafe"*
 ```
 
-```bash
+```sh
 set_network 3 psk *"Kosachok2019"*
 ```
 
 OR (for no password)
 
-```bash
+```sh
 set_network *3* key_mgmt NONE
 ```
 
-```bash
+```sh
 enable_network 3
 ```
 
-```bash
+```sh
 save_config
 ```
 
 This takes a while to connect, so to speed things up, restart the service:
 
-```bash
+```sh
 sudo sv restart wpa_supplicant
 ```
 
@@ -59,13 +59,13 @@ sudo sv restart wpa_supplicant
 
 You can script like this:
 
-```bash
+```sh
 wpa_cli add_network
 ```
 
 That returns an ID, so you can say:
 
-```bash
+```sh
 newNetwork="$(wpa_cli add_network)"
 ```
 
@@ -73,19 +73,19 @@ Then `$newNetwork` would equal that number, and you can add/ remove networks wit
 
 But remember to escape the quotes, so adding a network would be:
 
-```bash
+```sh
 wpa_cli set_network *3* psk *\""passphrase"\"*
 ```
 
 ## Generating Keys Manually
 
-```bash
+```sh
 wpa_passphrase [ssid] [password]
 ```
 
 For example:
 
-```bash
+```sh
 wpa_passphrase 'Cafe Kosachok' 'Kosachok2019'
 ```