fixed...a lot