diff --git a/makefile.library b/makefile.library
index d89b19f..d59209c 100644
--- a/makefile.library
+++ b/makefile.library
@@ -24,13 +24,19 @@ OBJDIR::=obj
 DEPDIR::=$(OBJDIR)/dep
 LIBDIR::=lib
 INCLUDE_DIRS::=include
+CFLAGS::=-g -std=c18 -Wall -pedantic -Wextra
 CXXFLAGS::=-g -std=c++17 -Wall -pedantic -Wextra
 EXT::=cpp
+LANG::=$(EXT)
 MAIN_LIBRARY::=test
 DLLOUT::=$(MAIN_LIBRARY).dll
 SHARED?=1
+RELEASE?=0
+MEMCHK?=0
 
 ifneq ($(WINDOWS),1)
+	#*nix settings
+	CC::=gcc
 	CXX::=g++
 	LDLIBS::=
 	LDFLAGS::=
@@ -39,7 +45,9 @@ ifneq ($(WINDOWS),1)
 	AR::=ar
 	AS::=as
 else #windows
+	#windows settings
 	MINGW_PREFIX::=x86_64-w64-mingw32-
+	CC::=$(MINGW_PREFIX)gcc
 	CXX::=$(MINGW_PREFIX)g++
 	LDLIBS::=
 	LDFLAGS::=-static-libgcc -static-libstdc++
@@ -50,7 +58,7 @@ else #windows
 endif #windows
 
 ifeq ($(SHARED),1)
-	ifeq ($(OS),Windows_NT)
+	ifeq ($(WINDOWS),1)
 		INTERNAL_MAIN_LIBRARY::=lib$(MAIN_LIBRARY).a
 	else
 		INTERNAL_MAIN_LIBRARY::=lib$(MAIN_LIBRARY).so
@@ -60,19 +68,15 @@ else
 endif
 
 
-all: CXXFLAGS+=-O0
-release: CXXFLAGS+=-O2
-
-memchk: LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
-memchk: CXXFLAGS+=-O0 -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
-
 ifeq ($(OS),Windows_NT)
+	#windows' cmd commands
 	mkdir=mkdir $(subst /,\,$(1)) > NUL 2>&1
 	rm=del /F $(1) > NUL 2>&1
 	rmdir=rd /S /Q $(1) > NUL 2>&1
 	move=move /Y $(subst /,\,$(1)) $(subst /,\,$(2)) > NUL 2>&1
 	copy=copy /Y /B $(subst /,\,$(1)) $(subst /,\,$(2)) > NUL 2>&1
 else
+	#*nix terminal commands
 	mkdir=mkdir -p $(1)
 	rm=rm -f $(1)
 	rmdir=rm -rf $(1)
@@ -80,9 +84,30 @@ else
 	copy=cp $(1) $(2)
 endif
 
-INTERNAL_CXXFLAGS=-c $(foreach dir,$(INCLUDE_DIRS),-I"$(dir)") -MMD -MP -MF"$(DEPDIR)/$(notdir $(patsubst %.o,%.d,$@))"
+#setup compiler and flags based on language
+ifeq ($(LANG),cpp)
+	COMPILER_FLAGS::=$(CXXFLAGS)
+	COMPILER::=$(CXX)
+else ifeq ($(LANG),c)
+	COMPILER_FLAGS::=$(CFLAGS)
+	COMPILER::=$(CC)
+endif
+
+ifeq ($(RELEASE),1)
+	#a lot of false strict aliasing warnings from gcc 9
+	COMPILER_FLAGS+=-O2 -Wno-strict-aliasing
+else ifeq ($(MEMCHK),1)
+	#use asan to check memory leaks/invalid accesses
+	LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
+	COMPILER_FLAGS+=-O0 -g3 -ggdb -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+	#default target
+	COMPILER_FLAGS+=-O0 -g3 -ggdb
+endif
+
+INTERNAL_COMPILERFLAGS=-c $(foreach dir,$(INCLUDE_DIRS),-I"$(dir)") -MMD -MP -MF"$(DEPDIR)/$(notdir $(patsubst %.o,%.d,$@))"
 ifeq ($(SHARED),1)
-	INTERNAL_CXXFLAGS+=-fPIC
+	INTERNAL_COMPILERFLAGS+=-fPIC
 endif
 SOURCES::=$(foreach source,$(SOURCE_DIRS),$(foreach ext,$(EXT),$(wildcard $(source)/*.$(ext))))
 OBJECTS::=$(addprefix $(OBJDIR)/,$(subst \,.,$(subst /,.,$(addsuffix .o,$(SOURCES)))))
@@ -91,34 +116,32 @@ OBJECTS::=$(addprefix $(OBJDIR)/,$(subst \,.,$(subst /,.,$(addsuffix .o,$(SOURCE
 
 ifeq ($(SHARED),1)
 ifeq ($(WINDOWS),1)
+#target for windows shared library
 all: $(DLLOUT)
 $(INTERNAL_MAIN_LIBRARY): $(OBJECTS)
-	$(CXX) -shared -o "$(DLLOUT)" $^ -Wl,--out-implib,"lib$(MAIN_LIBRARY).a" $(LDLIBS) $(LDFLAGS)
+	$(COMPILER) -shared -o "$(DLLOUT)" $^ -Wl,--out-implib,"lib$(MAIN_LIBRARY).a" $(LDLIBS) $(LDFLAGS)
 $(DLLOUT): $(INTERNAL_MAIN_LIBRARY)
 else #windows
+#target for *nix shared library
 all: $(INTERNAL_MAIN_LIBRARY)
 $(INTERNAL_MAIN_LIBRARY): $(OBJECTS)
-	$(CXX) -shared -o "$@" $^ $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
+	$(COMPILER) -shared -o "$@" $^ $(COMPILER_FLAGS) $(LDFLAGS) $(LDLIBS)
 endif #windows
 else #shared
+#target for static library
 all: $(INTERNAL_MAIN_LIBRARY)
 $(INTERNAL_MAIN_LIBRARY): $(OBJECTS)
 	$(AR) rcs "$@" $^
 	$(RANLIB) "$@"
 endif #shared
 
-.PHONY: memchk
-.PHONY: release
-memchk: all
-release: all
-
+#Object target recipe
 define GENERATE_OBJECTS
-
 $$(OBJDIR)/$(subst \,.,$(subst /,.,$(1))).%.o: $(1)/%
-	$$(CXX) $$(CXXFLAGS) $$(INTERNAL_CXXFLAGS) "$$<" -o "$$@"
-
+	$$(COMPILER) $$(COMPILER_FLAGS) $$(INTERNAL_COMPILERFLAGS) "$$<" -o "$$@"
 endef
 
+#Create targets for object files
 $(foreach dir,$(SOURCE_DIRS),$(eval $(call GENERATE_OBJECTS,$(dir))))
 $(OBJECTS): | $(OBJDIR) $(DEPDIR)
 
@@ -135,5 +158,6 @@ clean:
 	$(call rm,"lib$(MAIN_LIBRARY).a")
 	$(call rm,"$(DLLOUT)")
 
+#header file dep tracking
 -include $(wildcard $(DEPDIR)/*.d)