buncha changes and fixed html