Angular and bug fixing and getting rid of mess