Added todo's; fixed metric iconsize problem