various updates
fixed typo
fixed typo
reorganized controllers
updated declaration