* fixed compile errors
* added classes from caveexpress