General sync
Repaired Alert System and cleabed up Javascript code