Added some more stuff like bug fixes etc