Core pr 3 (merge with Artesis)

Basically updated make file and re-exported features.