Smexy number update.
Conflictsa fixed
Fixed the absolute path error
Merged toms changes with mine