made some improvements. can't even remember right now..