A few more features

code cleanup imminent