Fixed issue with libraries being listed wrong in Makefile. Added smart browsing feature.