some improvements
D'oh