added alot of fixes, notifications cant stack now
merged
fixed typos