More changes
Fixed bugs. Working except for notifications.