Additional fixing and making shit work.