updated main interface and loading routines
updated data structures