Some Method Extractions, Bug fixes, hardcoded stuff removed