Bug fixes + back to old c++ model filling style
Sign in bugfix due to changes in forum