Cleaned up main.js, added typing notificatins