cleaned up a bit | fixed 404's