fixed some optacity issues, removed garbage