add norms
fix bug, design fix