Fixed some methods, tried fixing MessageController.java class, but it doesn't work yet