Added missing stuff. Hope didnt break anything.