fixes for new features of core lineup which solves #4 and #3