More Java stuff, fixed DeckType bug