Mikera

Small fixes and update to latest core.matrix