Core pr 5

Module updates and minor bug fixes.