added message system + minor bug correction