many updates
fixes and removing console.logs
removing comments