fixed some issues and added friendly urls