last fixes for web (hope so)