made minor improvements and added some methods