Jesus Christ some fixes and add ons