bugfix and organized urls