Added notification system, improvements, improved readability, bug fixes