Fix to helperNumberLayer dimensions and Next arrow, related to #26
Merged latest from source