Added some more fixes, finished some extra details, apparently almost
all stable.