Fixed bugs + finished develop target