cleaned up js and added + to cal link