fixed.. everything