Updated Controller and Message

Added JavaDoc and made the controller more efficient