Some more cleanups and fixing!