added features to whitspace package, and moved lines around