Updated github project and sorted out little problems