major changes, me fix plus swing gui