Core pr 5

Minor fixes and module updates.