Complete code and some fixing stuff