Merged all files into one + bug corrections