Added some getters and setters for better code injection
Minor fixes