Got stuff to show up!

Also added some new options