ether+nick

@randulo homework, and just a little housework.