format a bit and changed cmd building to awesome annotation driven!