commit for real now. Some changes and delted js/js