Finish many rest issues and different bugs. This version is mostly
working... :)