router & controllers refactored; bugs fixed;