added transparency & cleaned up