Development

Cleaned up code, thug module vastly improved