Major fixes, changed deciper class (to be validated), added Javadocs