Added convinience methods and fixed some other things?