removed todo
fixed aliases etc