Some organization and linum fixes