spotted a few bugs this morning thanks to @Minja