another firefox attempt and some cleanup