Updated labels, small fix to module definition