Fixed stuff and added Jimmy's part.