a few more changes, I think it's finally working =)

YAY!