Cleaned up Machine todo;
Added documentation;