Some fixes, and continue to implement stuff.