Fixed stuff. everything is cleaned up.