Bug fixes, this version compiles...