src: bugs fixed, edited