more work and correction...(today is a good day! :D)