Mercilessly squashed bugs

need to add features next