Major changes

Added alert system
Fixed some bugs